Some cleanup of code, location is now refreshed each time you want