golint changes made