Removed depricated logic
Improved code comments
Updated API/phpDocs