Code review

made the changes requested