diff --git a/README.md b/README.md
index 8732996f4b..b74d1b6202 100644
--- a/README.md
+++ b/README.md
@@ -140,4 +140,4 @@ We also use the issue tracker to track features. If you have an idea for a featu
 - Remember users might be searching for your issue in the future, so please give it a meaningful title to helps others.
 - Clearly define the use case, using concrete examples. EG: I type `this` and kops does `that`.
 - Some of our larger features will require some design. If you would like to include a technical design for your feature please include it in the issue.
-- After the new feature is well understood, and the design agreed upon we can start coding the feature. We would love for you to code it. So please open up a **WIP** *(work in progress)* pull request, and happy coding.
\ No newline at end of file
+- After the new feature is well understood, and the design agreed upon we can start coding the feature. We would love for you to code it. So please open up a **WIP** *(work in progress)* pull request, and happy coding.
diff --git a/cmd/kops/create_cluster.go b/cmd/kops/create_cluster.go
index ae32e96fc8..7602793e18 100644
--- a/cmd/kops/create_cluster.go
+++ b/cmd/kops/create_cluster.go
@@ -158,7 +158,6 @@ func NewCmdCreateCluster(f *util.Factory, out io.Writer) *cobra.Command {
 	cmd.Flags().StringSliceVar(&options.AdminAccess, "admin-access", options.AdminAccess, "Restrict access to admin endpoints (SSH, HTTPS) to this CIDR.  If not set, access will not be restricted by IP.")
 
 	// TODO: Can we deprecate this flag - it is awkward?
-	// @kris-nova: Yes. Yes.
 	cmd.Flags().BoolVar(&associatePublicIP, "associate-public-ip", false, "Specify --associate-public-ip=[true|false] to enable/disable association of public IP for master ASG and nodes. Default is 'true'.")
 
 	cmd.Flags().StringSliceVar(&options.NodeSecurityGroups, "node-security-groups", options.NodeSecurityGroups, "Add precreated additional security groups to nodes.")
diff --git a/cmd/kops/integration_test.go b/cmd/kops/integration_test.go
index da35095c72..18a70f7904 100644
--- a/cmd/kops/integration_test.go
+++ b/cmd/kops/integration_test.go
@@ -293,7 +293,6 @@ func runTestCloudformation(t *testing.T, clusterName string, srcDir string, vers
 		if err != nil {
 			t.Fatalf("unexpected error reading actual cloudformation output: %v", err)
 		}
-
 		expectedCF, err := ioutil.ReadFile(path.Join(srcDir, expectedCfPath))
 		if err != nil {
 			t.Fatalf("unexpected error reading expected cloudformation output: %v", err)
diff --git a/upup/pkg/fi/README.md b/upup/pkg/fi/README.md
index 952a75522a..880359fb1d 100644
--- a/upup/pkg/fi/README.md
+++ b/upup/pkg/fi/README.md
@@ -27,4 +27,4 @@ After the resources to the cloud have been deployed, we will now need to provisi
 
 Nodeup runs as a binary **on VMs in the cloud** and will handle bringing up a kubernetes cluster.
 
-The core bits of `nodeup` infrastructure can be found here.
\ No newline at end of file
+The core bits of `nodeup` infrastructure can be found here.