Exercise 5 updated, plus additional formatting