Some command cleanup

Signed-off-by: Jack Huey kitskub@gmail.com