Address manish's review comments