Fixed more PEP-8 style issues