Tune fixtures, Code cleanup