Refactoring.
Medium sized data passes.