Tweaks for PEP8
massive cleanup for PEP8