Code style, and some tweaking of the layout of model classes.