Cleanup code & documentation