Clean nice code pushed