Copyright change + whitespace & comments cleanup

No functional changes.
disable dbg macro