Fixed PEP8 issues except E501