tidied up some pylint and flake8 warnings

[marksmayo]

• sorted imports
• cleaned some whitespace
• tidied some flake8 docstring warnings
• fixed trailing commas as per flake8 for 3.5,3.6+
• added specific encoding for file writing
• simplified some conditional statements

[ikamensh]

Let's remove change to the encoding. The rest looks good.