[CLEANUP] Checkstyles
Merge pull request #1490 from jeffreythomas/dev

[CLEANUP] Checkstyles