Merge pull request #207 from eddiehung/xc7

[xc7] clangformat and more cleanup