Minor non-functional improvement

Fix warnings in IDE
Fix Javadoc errors