Working on editing refactoring