commands small refactor