+ refactoring plus the YambaApplication