conversion rate refactor