Adding debounced pushbuttons
Clean up button code