Refactoring imports for better review