Made changes requested in review