Style changes, minor fixes, cleanup.
Style, minor fixes and cleanup.