Refactored location hashes into location objects where appropriate