Incorporated Srikanth's review comments