Improvements to format