Improve format (again)