Add licence and clean up tags