Backups storage

Add a backups archive storage abstraction and do a little cleanup.
I was trying to avoid a really long line, but I agree the overall condition could be more clear.