minor refactoring (renaming), single performance improvement
Merge pull request #18 from IanMayo/features/ian/tidy_spatial

minor refactoring (renaming), single performance improvement