Minor Restructure to reduce prevalence of anonymous subs and reduce overall logic