Refactor some locations
Refactor some locations