code refactoring part ii cit 597 2564138