Refactor game models