Zertz: refactoring