refactor all statics