[WIP] Formatter improvements

Due to the existing normalize function, some formatter issues were hidden.
This PR removes that function and attempts to fix some of the issues