* redo changes * more cleanup Co-authored-by: Zeke Sikelianos <zeke@sikelianos.com> Co-authored-by: Laura Coursen <lecoursen@github.com> Co-authored-by: Melanie Yarbrough <11952755+myarb@users.noreply.github.com> Co-authored-by: Meg Bird <megbird@github.com>