Refactoring last commit