Making output more consistent for toolbox