Fix a slew of indentation and parameter naming style issues. This 80% of