Clean up the code that first fetches