Code cleanup + Rewrite ExchangeHelper (Work in progress)