Continuing our re factoring adventure.