Minor change

Reorganized imports and fixed typos.