StyleCop improvements.

Improved readability and code layout based on the results of a StyleCopy
pass through. The entire solution has yet to be properly organized; it
is a lot better now however.