First step of refactoring