Refactoring, locatiors.py