[FNA] #147 first pass at cleanup for ./ CurveKey to Game