Improve commands description + clean