Whitespace and documentation fixes.
Push some dead code out of the way.
Minor cleanup
Move code out of the header file
Move more code out of heaer file
Misc header-file cleanup
Get rid of a major namespace polluter

Oofdah!
Imissed a few spots with previous commit