Fixing PEP8 issues