Updated formatting and line wrap