Feature/code review test2 #(pivotal ID)

Please asses the code @simmibadhan