some code review issues