Refactor game to use proper inheritance