fixed typo
fixed double import and other minor style bugs