Clarifies, simplifies source code. Fixes formatting.
Expedites the realization of the expiry of endpoints in order to better the behavior of the last-n functionality.