Refactor cyclical dependency.