Naming convention and better parsing of Location
3 files changed