Auto-Location Cleanup

I've refactored a bit. Any thing else I should fix for this pull request?