More doc/golint cleanup