Enricher

INT-3465:Content Enricher Improvements
`else {` from new line. Core style: https://github.com/spring-projects/spring-framework/wiki/Spring-Framework-Code-Style