Minor changes

Explanations for some changes are in the respective commit message
I like the timings as they were. I want this example to be as slim as possible to illustrate the functions.