A few small changes `inspired` by golint.