General renaming and cleanup.

examples/us-enrichment-api/geo-reference/main.go

@@ -28,7 +28,7 @@ func main() {
 		ETag:      "", // optional: check if the record has been updated
 	}
 
-	err, results := client.SendPropertyGeoReference(&lookup)
+	err, results := client.SendGeoReference(&lookup)
 
 	if err != nil {
 		// If ETag was supplied in the lookup, this status will be returned if the ETag value for the record is current
@@ -43,6 +43,4 @@ func main() {
 	for s, response := range results {
 		fmt.Printf("#%d: %+v\n", s, response)
 	}
-
-	log.Println("OK")
 }

examples/us-enrichment-api/propertyFinancial/main.go → examples/us-enrichment-api/property-financial/main.go

@@ -45,6 +45,4 @@ func main() {
 	for s, response := range results {
 		fmt.Printf("#%d: %+v\n", s, response)
 	}
-
-	log.Println("OK")
 }

examples/us-enrichment-api/propertyPrincipal/main.go → examples/us-enrichment-api/property-principal/main.go

@@ -45,6 +45,4 @@ func main() {
 	for s, response := range results {
 		fmt.Printf("#%d: %+v\n", s, response)
 	}
-
-	log.Println("OK")
 }

us-enrichment-api/client.go

@@ -36,10 +36,10 @@ func (c *Client) SendPropertyPrincipal(lookup *Lookup) (error, []*PrincipalRespo
 	return err, propertyLookup.Response
 }
 
-func (c *Client) SendPropertyGeoReference(lookup *Lookup) (error, []*GeoReferenceResponse) {
-	geoReferenceLookup := &geoReferenceLookup{Lookup: lookup}
-	err := c.sendLookup(geoReferenceLookup)
-	return err, geoReferenceLookup.Response
+func (c *Client) SendGeoReference(lookup *Lookup) (error, []*GeoReferenceResponse) {
+	geoRefLookup := &geoReferenceLookup{Lookup: lookup}
+	err := c.sendLookup(geoRefLookup)
+	return err, geoRefLookup.Response
 }
 
 func (c *Client) sendLookup(lookup enrichmentLookup) error {
@@ -89,7 +89,7 @@ func buildRequest(lookup enrichmentLookup) *http.Request {
 func buildLookupURL(lookup enrichmentLookup) string {
 	newLookupURL := strings.Replace(lookupURL, lookupURLSmartyKey, lookup.getSmartyKey(), 1)
 	newLookupURL = strings.Replace(newLookupURL, lookupURLDataSet, lookup.getDataSet(), 1)
-	return strings.Replace(newLookupURL, lookupURLDataSubSet, lookup.getDataSubset(), 1)
+	return strings.TrimSuffix(strings.Replace(newLookupURL, lookupURLDataSubSet, lookup.getDataSubset(), 1), "/")
 }
 
 const (

us-enrichment-api/lookup.go

@@ -119,7 +119,6 @@ func (e *principalLookup) populate(query url.Values) {
 	e.Lookup.populateExclude(query)
 }
 
-////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////
 
 type geoReferenceLookup struct {
@@ -128,7 +127,7 @@ type geoReferenceLookup struct {
 }
 
 func (g *geoReferenceLookup) getDataSubset() string {
-	return geoReferenceDataSubset
+	return emptyDataSubset
 }
 
 func (g *geoReferenceLookup) populate(query url.Values) {
@@ -171,11 +170,11 @@ func (g *geoReferenceLookup) unmarshalResponse(bytes []byte, headers http.Header
 ////////////////////////////////////////////////////////////////////////////////////////
 
 const (
-	financialDataSubset    = "financial"
-	principalDataSubset    = "principal"
-	propertyDataSet        = "property"
-	geoReferenceDataSet    = "geo-reference"
-	geoReferenceDataSubset = ""
+	financialDataSubset = "financial"
+	principalDataSubset = "principal"
+	propertyDataSet     = "property"
+	geoReferenceDataSet = "geo-reference"
+	emptyDataSubset     = ""
 )
 
 func (l Lookup) populateInclude(query url.Values) {

us-enrichment-api/response.go

@@ -502,6 +502,7 @@ type FinancialAttributes struct {
 	VeteranTaxExemption            string `json:"veteran_tax_exemption"`
 	WidowTaxExemption              string `json:"widow_tax_exemption"`
 }
+
 type GeoReferenceResponse struct {
 	SmartyKey   string                 `json:"smarty_key"`
 	DataSetName string                 `json:"data_set_name"`