In the middle of refactoring edit