Refactoring -intermediate commit