Re-factored the Overview section