Cleans up the code a tiny bit, moving comments around, removing some
`@SuppressWarnings` and some unused code, and using modern Java
features.
These changes should require no modifications to any outside mods.
---------
Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>