Refactoring

Thinking about bets...