Refactor: call commands following docs recommendation.