iMinor refactoring.