Addressed the code review comments