address issues identified during code review