008.04 cleaning up command handling