Refactors imports etc