Looks like the diff reflects a lot of indentation corrections, likely caused by my vim's auto-indent
I added a comment below for each *real* code change