refactoring + changing license text