Simplify logic
Bump copyright year
Add a mailmap file