Delete an unnecessary variable
Add pagination (in progress)