Storage/file improvements

As discussed in https://github.com/inveniosoftware/invenio/issues/2353
Personally, I would go for `elif` and indent line 29, but **`continue`** will work too.