address 2 code review issues