Some doc and golint cleanup