CQM-44 Removed superfluous code. Cleanup

* Improved formatting
* Variables are formatted with curly braces {}