code review comments solved