Make the code more PEP8 compliant, fix coding style.