Ryan's styling updates

I'll probably have some more minor refinements, but this is getting pretty close.
Indentation and white space is all messed up in this file.  Its okay for now, but it helps with readability and identifying changes during the code review if changes like this are not committed.