Continued to clean the code.