Cleaned Up Code thanks to IntelliJ
More Cleanup Work thanks to IntelliJ