Begin refactoring range-finding methods