Cleanup imports
Simplify naming