Refactoring first problem.