Java CDI friendly details
Cosmetics and clean up for config files - more or less examples