Cleaned up tracing