refactoring-assignment-1