[CLEANUP]: Fixed Checkstyle violations

Ran tests and Checkstyle to make sure the tests pass. There is still a CheckStyle error but I believe fixing it involves some slight refactor I don't care to do at this time.