Clean up & format rest of the code.