Cleanup and correcting license information