Pre re-factoring