finalized code review