fix some golint suggestions