- Naming enhancement for unified diff
- Fix extra newline introduced by r"""\