Made listing behavior less repetitive.

Easier to read and fewer lines.