Apply Adrien Merlini's review.
A few reformatting later.