Fix formatting and some small changes.
First attempts for exercise 4.