minor deferred refactoring