CLIMATE-479 - Clean up return type documentation