Small cleanup
Write more class documentation