Formatting, comment consolidation, and line endings