Code cleanup and style changes.

Code cleanup and style changes.