Begin to clean the code