static refactoring
fix