Clean up

updated method names to camelCase
added brackets in conditionals for consistancy
removed redundant vars