Finishing up small stylistic changes.
One big ole commit.