refactoring, move static