Nothing of substance changed. Just followed recommendations of PEP8 code inspection.