Cleaned up formatting.

Turned off VS automatic C++ formatting since I can't get it to do what I
want.