some small command cleanup