Made Changes as per Lab 3 feedback

See Standup Meeting # 14 for details