Clean + add support of CLosure