Some cleanage