* API: result data generation cleanup, minor cleaning