Final opinionated code clean-ups: for commands