Cook:Fix subscription layout, cleaning local var