SCRUM-CR-93 - Code rewview updates