Re-factoring started...