Refactor all rangeFinding methods