[CLEANUP]: Fixed Checkstyle violations
Merge pull request #231 from mattyb149/master

[CLEANUP]: Fixed Checkstyle violations