clean overall code