diff --git a/drivers/docker/config.go b/drivers/docker/config.go
index e62678848..6d2edae5d 100644
--- a/drivers/docker/config.go
+++ b/drivers/docker/config.go
@@ -437,7 +437,7 @@ func (d *Driver) SetConfig(data []byte, cfg *base.ClientAgentConfig) error {
 		removeDelay: d.config.GC.imageDelayDuration,
 	}
 
-	d.coordinator = NewDockerCoordinator(coordinatorConfig)
+	d.coordinator = newDockerCoordinator(coordinatorConfig)
 
 	return nil
 }
diff --git a/drivers/docker/coordinator.go b/drivers/docker/coordinator.go
index 457e14eb8..df83b4820 100644
--- a/drivers/docker/coordinator.go
+++ b/drivers/docker/coordinator.go
@@ -109,8 +109,8 @@ type dockerCoordinator struct {
 	deleteFuture map[string]context.CancelFunc
 }
 
-// NewDockerCoordinator returns a new Docker coordinator
-func NewDockerCoordinator(config *dockerCoordinatorConfig) *dockerCoordinator {
+// newDockerCoordinator returns a new Docker coordinator
+func newDockerCoordinator(config *dockerCoordinatorConfig) *dockerCoordinator {
 	if config.client == nil {
 		return nil
 	}
diff --git a/drivers/docker/coordinator_test.go b/drivers/docker/coordinator_test.go
index c6113aa15..def16a694 100644
--- a/drivers/docker/coordinator_test.go
+++ b/drivers/docker/coordinator_test.go
@@ -68,7 +68,7 @@ func TestDockerCoordinator_ConcurrentPulls(t *testing.T) {
 	}
 
 	// Create a coordinator
-	coordinator := NewDockerCoordinator(config)
+	coordinator := newDockerCoordinator(config)
 
 	id, _ := coordinator.PullImage(image, nil, uuid.Generate(), nil)
 	for i := 0; i < 9; i++ {
@@ -119,7 +119,7 @@ func TestDockerCoordinator_Pull_Remove(t *testing.T) {
 	}
 
 	// Create a coordinator
-	coordinator := NewDockerCoordinator(config)
+	coordinator := newDockerCoordinator(config)
 
 	id := ""
 	callerIDs := make([]string, 10, 10)
@@ -186,7 +186,7 @@ func TestDockerCoordinator_Remove_Cancel(t *testing.T) {
 	}
 
 	// Create a coordinator
-	coordinator := NewDockerCoordinator(config)
+	coordinator := newDockerCoordinator(config)
 	callerID := uuid.Generate()
 
 	// Pull image
@@ -234,7 +234,7 @@ func TestDockerCoordinator_No_Cleanup(t *testing.T) {
 	}
 
 	// Create a coordinator
-	coordinator := NewDockerCoordinator(config)
+	coordinator := newDockerCoordinator(config)
 	callerID := uuid.Generate()
 
 	// Pull image
diff --git a/drivers/docker/docklog/plugin.go b/drivers/docker/docklog/plugin.go
index d93888f0b..bc81d0ce7 100644
--- a/drivers/docker/docklog/plugin.go
+++ b/drivers/docker/docklog/plugin.go
@@ -15,7 +15,6 @@ import (
 const PluginName = "docker_logger"
 
 // LaunchDockerLogger launches an instance of DockerLogger
-// TODO: Integrate with base plugin loader
 func LaunchDockerLogger(logger hclog.Logger) (DockerLogger, *plugin.Client, error) {
 	logger = logger.Named(PluginName)
 	bin, err := discover.NomadExecutable()