Refactor poker game