Fixed golint issues