Formating improved