Cleanup, fixed memory assigement to game