Minor comments and go fmt