Remove some duplication in fetching org status