More clean up & documentation