#232 Tracing updated + code style improved + typo fixed