Code cleanup.
Merge pull request #39 from mjafshar/geocache_user_prompt

Code cleanup.