Styling / formatting cleanup