Re-factored the User section