Again an other refactoring