cleanup, edits