[CLEANUP] Checksytle and formatting
Merge pull request #1899 from jeffreythomas/dev

[CLEANUP] Checksytle and formatting