Cleaning up names, adding documentation.

Just a minor clean up cycle before I get to the main work still left.