a little static refactoring