Refactoring
Add License