Merge pull request #1899 from jeffreythomas/dev

[CLEANUP] Checksytle and formatting
[CLEANUP] Checkstyle and formatting