refactoring, shorter commands