More refactoring of stepGame