Improved formatter