Short refactoring