Tidy up, and add scheduled timestamp to Game