Clean up and improve User creation/fetching