Improve typyng.
Remove unused imports.