Refactors && fixes import statement