clean up and tuning