Stylistic changes

Improve the general style of the source tree, for sanity's sake.