command: more short command cleanup