Add increment/decrement buttons for both players and clean up code