Voracity is finished, a bit of refactoring