Clean up allocations with brackets (looks cleaner IMO).
Create state machine for deal phase and clean up header/cpp file.