Making the first refactoring