Refactor saveLocation: