refactor locations to remove a bit of redundancy
Merge pull request #352 from rabbitt/refactor-location

refactor locations to remove a bit of redundancy