TEMP: small refactoring