Finished cleaning the code.