Re-factored project