Formatting fixes for long lines