Preparation work (Minor changes)

* Formatted
* Misc clean-ups