[CLEANUP] Checkstyle and formatting
Merge pull request #1900 from jeffreythomas/dev

[CLEANUP] Checkstyle and formatting