Last commit clean code