Fix imports
Modernize code