Fix golint complaints