Keypad is killing me.  Cleaned this up a bit.