Refactor parameter definitions
Added pagination defeating
A sprinkle of code comments