Documentation cleanup
Code cleanup. Same functionality, more documentation.