Tweaked EZOutputDataSource formatting