Format commands better