Cleanup
Add limit to the API call
Pagination