Rearranged file contents and removed some whitespacing

A couple other single line cleanups mixed into the overall change.