Poker game - big refactoring