Refactored LocationManager out of View and a bit more cleanup of the code