Added support for JSONP & cleanup.