A little refactoring getting ready for some key on key action