Game command refactor