Improve commands [ci skip]