refactoring last commit