refactoring and fixed license info