cleaning cod
merged