Updated License
Refactoring