Minor fixups: remove redundant null check, remove redundant initial assignment + start of javadoc fixups