More refactoring to the Gameplay class