Some refactoring towards composition root pattern