* Minor code style and other changes.