Make short refactoring