General tidying up

[martinghunt]

• use __main__.py file
• reformat code with Black
• tidy up pyflakes warnings
• Use raise Exception everywhere