Reorganized imports, fixed a small quirk