Refactor edits