Code analyzation/fixup, thanks intellij!