cleanup and organize imports