Clean up method names
Add Blinker Puffer