Fix: some more closer to PEP-8.