Code changes from review