Adding better formatting