Refactoring code. No more special conditions for Player 1.