Cmplete but minor code review