Clean some code, license