Some cleanup and framework for implementation of tuning.