slight reorg for clarity