License new code changes, cleaning