Refactored geohash