Coding standards / whitespacing cleanup