Minor tweaks suggested by golint