Improved formatting on 2.2.5.2