Refactor last commit