Make suggested changes from review - submit for Iteration 2