Clear white space and rename methods for clarity.