First refactoring step