Some tidy up around licenses
updated version