refactor poker class