Refactored/updated location usage. #37