First refactoring.