Made it Google Closure compatible
Cleanup