few style and redundunt import fixes