General fixes per PEP8
general PEP8