Refactoring for reflextion.
Breaking commit.