some code style changes.