Code organization, cleaning and oprimized