A bit of refactoring, starting the volumes listing part