Fix quality flaws:
 - Useless import
 - formatting