updates to GameData.java, refactoring