Fixed debounce on the button, cleaned up too