Refactoring edits