Simplify and correct getRange... adds macros