Refactored blinkers to separate class