PEP8 standard and minor fixes