Cleaning up, revising comments