Refactoring: part 1