cheetah tuning code, cleanup