Fix spelling typo
Organize imports and remove duplicate functions