Code Refactoring: part 2