Cosmo Game: Further work on refactor