Cleanup according to IntelliJ inspection