More coding style changes.