Some doc cleanups as suggested by golint