Organize imports
Code cleanup