[PATCH v9 9/9] improve formatting