Moved formatting to specific #defines.