split classes even more and use composition for the one single class call