Major improvements to format
3.0.0