Hoop refactoring gedaan