Fix golint alerts