Revert "Fiddled with view functions to provide a little more flexibility"

This reverts commit c6d5f20eb38cddc6f385f28a36a2c314bff6e616.