Edit - refactoring