Tidy up keypad component