Refactor commande site