edits refactoring