Fixed license infos
Refactoring