Game: Add class var event
Game: Bit of clean up