address Tim's feedback, will squash this commit later.