To not create too big change at once. Consider this PR to be a first step of the long process of cleaning up our code base :)