Cleaning last commit code