Remove not used imports
Prevent name collision
Various coding style improvements