Cleanup import
Update lib: Tornado