diff --git a/http/http_test.go b/http/http_test.go
index 107a517..fcbbf79 100644
--- a/http/http_test.go
+++ b/http/http_test.go
@@ -20,11 +20,11 @@ func (t *testDb) Country(net.IP) (geo.Country, error) {
 	return geo.Country{Name: "Elbonia", ISO: "EB"}, nil
 }
 
-func (t *testDb) City(net.IP) (database.City, error) {
-	return database.City{Name: "Bornyasherk"}, nil
+func (t *testDb) City(net.IP) (geo.City, error) {
+	return geo.City{Name: "Bornyasherk"}, nil
 }
 
-func (t *testDb) IsEmpty() bool               { return false }
+func (t *testDb) IsEmpty() bool { return false }
 
 func testServer() *Server {
 	return &Server{gr: &testDb{}, LookupAddr: lookupAddr, LookupPort: lookupPort}
diff --git a/iputil/geo/geo.go b/iputil/geo/geo.go
index 2b918e1..f1be5cf 100644
--- a/iputil/geo/geo.go
+++ b/iputil/geo/geo.go
@@ -1,8 +1,8 @@
 package geo
 
 import (
-	"net"
 	"math"
+	"net"
 
 	geoip2 "github.com/oschwald/geoip2-golang"
 )