Fix indentation + tracing
Fix indentation + comments