Neatpick: move DBG() to pertinent place