Tidied up some golint warnings