Smarter formatting