Clean up style for #692