More organized data fetching

yup