clean up & edits