Addressed the code review comments raised on the PR