clean up, edit comments