End of Game refactoring.