More refactoring

Removed import *