Refactor code to avoid trait usage

[MacFJA]

Is this version better ?

It still keep the logic outside of every classes (prevent duplicate code, and ease maintainability) and shouldn't be too much overhead.

[theseer]

Yeah, like that a lot better. I'll have a look if we can get rid of instantiating it within the object and can have it injected but otherwise looks good.