Fix the code layout

[ziotom78]

A few of the PRs that have been merged have broken the tests ran by bin/run_tests.sh (the ones employing black and flake8). It would be advisable to fix these inconsistencies before releasing 0.2.0.