code cleanup- removed unused imports and rearranged import statements to match convention