Updated formatting for final version