code review modifications