Cleanup javadoc to fix warnings