Fixed some IntelliJ code inspection findings