fixed useless import and style fixes