Refactoring init
Clean-up import