Better formatting (2)