Clean-up.
Refactored a bit.
Merge branch 'feature/config-generator-refactoring' into develop