Some golint cleanups