code review issues fixed