Some cleanup
Code cleanup
Default distance now 25km