last commit. simple refactoring