Basic cleanup; new Range Search function