Cybergame - refactor