Re-factored, thanks.