Initial refactoring of the Location class.