Updated Variable Names and Whitespace