Refactoring previous