Refactor, flake8 didn't understand this class nesting
Tune export list
Run flake8 on the source as part of the build