Fix code formatting
Remove helper
Add note about {YMDHMS} and {YMDN} not corresponding between HEAD and upstream commits