Continued Refactoring

More refactoring of the geoCode to remove bugs undiscovered yet.