0903 Re-factoring