Code Reviews for user story 18