PEP8'd config and other small changes