Cruft removal
Adjust where and how distance is calculated