edits and cleanup