Finally, some more style changes.