Cleaning up comments and code.