Restructuring for proper format and game states