Slight cleanup
currenlocation refactor
Changes to currentlocation model