More clean up suggestions from intellij