Final code for second code review for week 2

Same comment as above.