Ex 5.2: Cosmetics.
Ex 5.2: fixed bug.