Golint warnings fixed.