Clean code and finish first part