DIAG: improve code prettiness