Made changes recommended by TA