License fix. Refactoring