applied code review comments