More gentle and careful pep8 violations removal

Okay, I was over zealous the first time ... so let's try this again ... more gently