some refactoring
shortcut