Addressed Code review comments