cleaning up location and adding some nice utilities