Final golint cleanup for client