Code cleanup after intellij inspection