Formatting now uses 2.6 allowed conventions