Re-factoring.
