tuning, cleanup