Second beautification attempt.

Didn't get those lists right ...