intermediate commit - refactoring