Implemented code review comment given by Sri