code cleanup per Nina's feedback