fix Javadoc and instanceof not required null check