refactor static classes