Refactor system description 2

Supercedes #422
Align the elements of a hash literal if they span more than one line.