Refactor stepGame