Cleanup style for better organization.

I did this so that it is better structured, easier to find things, and easier
to link directly to specific sections.