Code cleanup: organize imports