Fix imports
Cleanup, minor optimization