Updated formatting using Tailor