Fixed raw formatting