Revised formatting