Added better formatting and color