Did some awesome IntelliJ inspection

Still needs to be tested though