Refactor betting round
basic functionality tested