The last PEP8 stuff thanks to shezi