Did a clean-up of the code with the new formatter