Cleaned Up Code (I enabled more IntelliJ Inspections and caught silly things I did so :))