Fix intellij warnings
Fix javadoc