Exercise: Improve previous examples