Some style cleanup.