Geographic Locations: minor refactors + incremental remediation task