Better output when building docker images
Refactor Docker support
Flake8 fixes