Improved formatter.