Minor cleanup and styling.