Changed disclaimer
Refactored code