Easier to read usage (lot)

Will do more over time
Merge pull request #183 from lDiverse/patch-65

Easier to read usage (lot)