refactoring

remove static