Clean up a few golint warnings