cleanup and organization of imports