Statics refactoring