Extend that style
Clean up formatting