Clean up comments and rename methods.