DIAG: rm Debug import
DIAG: improve readability