* Minor optimization and code style changes.