PEP-8 fixes.
Allow for upper/lower case format option