Fix for crash in cursor management from method rename
Minor rename and method extractions
Naming variables for complicated range