continue to clean the code.