Licence + clean up + comments