Main Style Fixes, Formatting, Renaming

Some style issues fixes. Renamed some methods and variables.