short refactor