Addressed comments in the code review