Refactor pitch octave property