Monopoly refactor