Code cleanups - cleaned up IDEA warnings