Make examples match book
Tidying up More module