Refactor for static classes.