minor refactor within Org