fixing golint warnings