Refactor quarto logica

Kleine opruiming van de business logic en task shizzle.