cleaner edits, new swap strings