Intermediate commit. Refactoring