Refactor oscillator inheritance