code review issues corrected