With the same end-goal of refactoring some part of the code base, improving code readability would be great too Per @valentinewallace idea.