Minor tweaks in prparation for SCJP materials