Move declaration of DockerCli to top of file for readability

Signed-off-by: Solomon Hykes <solomon@docker.com>
Rename a method for clarity

Signed-off-by: Solomon Hykes <solomon@docker.com>
Merge pull request #7507 from shykes/cleanup-tiny

Cleanup: tiny little things