Refactor tunes