Minor fixes for consistency and formatting