little debug traces and code clean