change: reorganize, remove dbg trace messages