Updated formatting and some content