Code cleanup in data classes.