Intermediate commit - refactoring