Continued cleaning of code.