Documentation cleanup
Code cleanup