Tidy up data

Game class and remainder of display is all that is left before merge is
possible