Some coding style changes.