Fix formatting and colours