Trying to get ~100 chars per line to fit nicely in Github's code-view

@alaframboise Let me know if this is ok with you.

Cheers!!!