Applied go vet and golint suggestions