Refactor Location class