Code cleaning.

Removes useless "import" and fix code indentation.