Could you run the new file through indent?   Feel free to override any changes that horribly break readability.

indent -npro -kr -i8 -ts8 -sob -l80 -ss -ncs

It makes it easier to review and matches the style of the other code better.

Thanks,
Myles