clean up, naming, docs