CleanUP code