Style and coordinate fixes.

Thanks for catching the non-height coordinate and style issues.  Here are the fixes.

I also ran the formatter on the code.  It's a good idea to do that every time before you submit.  Basically highlight all of the code except the top includes and hit CRTL-SHIFT-F.