Refactor and cleanup.
Refactor and cleanup.

Crowducate/crowducate-next,Crowducate/crowducate-next,KshirsagarNaidu/bodhiprocessor,KshirsagarNaidu/bodhiprocessor,Crowducate/crowducate-platform,Crowducate/crowducate-platform