diff --git a/plugins/input/postgis/postgis_datasource.cpp b/plugins/input/postgis/postgis_datasource.cpp
index bc0a67a8e..bc858d7b0 100644
--- a/plugins/input/postgis/postgis_datasource.cpp
+++ b/plugins/input/postgis/postgis_datasource.cpp
@@ -110,7 +110,7 @@ postgis_datasource::postgis_datasource(parameters const& params)
         if(max_async_connections_ > pool_max_size_)
         {
             std::ostringstream err;
-            err << "PostGIS Plugin: Error: 'max_async_connections (";
+            err << "PostGIS Plugin: Error: 'max_async_connections ("
                 << max_async_connections_ << ") must be <= max_size(" << pool_max_size_ << ")";
             throw mapnik::datasource_exception(err.str());
         }
@@ -630,10 +630,12 @@ boost::shared_ptr<IResultSet> postgis_datasource::get_resultset(boost::shared_pt
 
 processor_context_ptr postgis_datasource::get_context(feature_style_context_map & ctx) const
 {
-    std::string ds_name(name());
     if (!asynchronous_request_)
-        return  processor_context_ptr();
+    {
+        return processor_context_ptr();
+    }
 
+    std::string ds_name(name());
     feature_style_context_map::const_iterator itr = ctx.find(ds_name);
     if (itr != ctx.end())
     {
@@ -645,10 +647,10 @@ processor_context_ptr postgis_datasource::get_context(feature_style_context_map
     }
 }
 
-featureset_ptr postgis_datasource::features(const query& q) const
+featureset_ptr postgis_datasource::features(query const& q) const
 {
     // if the driver is in asynchronous mode, return the appropriate fetaures
-    if ( asynchronous_request_ )
+    if (asynchronous_request_ )
     {
         return features_with_context(q,boost::make_shared<postgis_processor_context>());
     }
@@ -658,7 +660,7 @@ featureset_ptr postgis_datasource::features(const query& q) const
     }
 }
 
-featureset_ptr postgis_datasource::features_with_context(const query& q,processor_context_ptr proc_ctx) const
+featureset_ptr postgis_datasource::features_with_context(query const& q,processor_context_ptr proc_ctx) const
 {
 
 #ifdef MAPNIK_STATS
diff --git a/plugins/input/postgis/postgis_datasource.hpp b/plugins/input/postgis/postgis_datasource.hpp
index 1944e45c8..c55af9812 100644
--- a/plugins/input/postgis/postgis_datasource.hpp
+++ b/plugins/input/postgis/postgis_datasource.hpp
@@ -69,8 +69,8 @@ public:
     mapnik::datasource::datasource_t type() const;
     static const char * name();
     processor_context_ptr get_context(feature_style_context_map &) const;
-    featureset_ptr features_with_context(const query& q, processor_context_ptr ctx= processor_context_ptr()) const;
-    featureset_ptr features(const query& q) const;
+    featureset_ptr features_with_context(query const& q, processor_context_ptr ctx= processor_context_ptr()) const;
+    featureset_ptr features(query const& q) const;
     featureset_ptr features_at_point(coord2d const& pt, double tol = 0) const;
     mapnik::box2d<double> envelope() const;
     boost::optional<mapnik::datasource::geometry_t> get_geometry_type() const;
@@ -113,10 +113,8 @@ private:
     bool estimate_extent_;
     int max_async_connections_;
     bool asynchronous_request_;
-    // params below are for testing purposes only (will likely be removed at any time)
     int intersect_min_scale_;
     int intersect_max_scale_;
-
 };
 
 #endif // POSTGIS_DATASOURCE_HPP