More tracing, code cleaning