Restore the ANSI C compliance after adding the ARM optimization

Also apply style and formatting fixes
2 files changed