Tidy up

Removed some macros that subtracted from clarity
Removed code that tried to deal with time stored in a byte
Debouncing now uses time as a long (might revisit later)