last game refactorings