cleaned up command expressions