Final formatting before demo