minor (unverified)
refactoring