Organize imports
A little cleanup