Some documentation and stylistic clean up.