Refactoring of previous commit