Formating enhancements