Cleaned up some code after merging pull request, good for orgs, and create-org
[#56561968, #56649444]

Signed-off-by: Damien Le Berrigaud <damien@pivotallabs.com>