Issue #22: Simplify the expires view

Here is the pull request corresponding to the changes discussed in Issue #22. There is no new test or changes in the tests because I didn't moved the API at all. This is only an internal optimization.