The short syntax isn't shorter
Long code lines interfered with the design
Merge pull request #80 from Jadaw1n/master

Textual and cosmetic improvements