Format
Remove static classes.