Minor cleanup of GameEngine class
More header cleanup