Code Quality Enhancement(Removed skipPagination and made relevant changes).