Improved formatting again