tidying, per Riz's feedback