Better formatting and presentation