Updated Funnel Section & Cleaned Up Code