Tuning and cleaning up