Final style cleanup.