Made formatting more consistent across classes.