Not used import
Various coding style improvements