Re-factored code base