Formatting and adding more information