Clean code of last commit