Add  to Organization schema ref. Also gofmt the file
clean up the conditional check for Heroku organization