Modified the code based on review comments
Modified the code based on review comments

sauravmndl/service-fabrik-broker,sauravmndl/service-fabrik-broker,sauravmndl/service-fabrik-broker,sauravmndl/service-fabrik-broker