Clean up & documentation work