Code re-factoring.