Updated format and spacing