Even more clean up suggestions from intellij