CDI refactoring
2 files changed