Changes to golint clean