* Updated API Documentation
* Cleanup