Minor chnages for constantify and logic change
Minor chnages for constantify and logic change

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