Richard's code review