Fix tracing level comparison condition.  Clean-up logging and indentation