short refactoring