Updated the code as per admin comments

Author-by: ravipesala <ravindra.pesala@huawei.com>