Addressed the issues from the code review