Optimizations.

It does not seem they are really necessary, but still.
Merge branch 'development' of github.com:peerlibrary/peerlibrary into development