PEP8 and styling.

Please test it before you merge it.