More work on code review