Formatting fixes for consistency