fix up issues brought up in code review