Fixed some "&%&% PEP8 complaints