Some style fixes and cleanup.