Location control refactor