Change formatting to be closer to SWC formatting