Cleanup, efficiency
Random trail based on trace.py