Whitespace formatting cleanup

There are still a few snake cased variable names, that should probably be fixed.