Some cleanups and refactors; thx to _9_9_ / reddit
Some cleanups and refactors; thx to _9_9_ / reddit

Apply some of that PEP8 nomenclature goodness.

Refactor the formats into a dict and combine with their associated
booleans.

Change __str__ to use the new formats dict in a join.  No more
chain-o-ifs - woot!

briangerard/incidr