Made changes based on feedback from the code review