Refactored a cyclic import.