Make output format more regular