Eradicate use of range
Fix regression
refactored handle function names to make the editor stack more readable