Refactoring previous commit