Some refactoring of blink class