Clean up by renaming methods/variables, remove parens, and clean white space.