Javadoc fix
Javadoc and unnecessary cast cleanups (via Intellij)