Better formatting for template