Add comments, shorten some lines

This makes pylint a bit happier, though still cranky. ;-)