Removed some pedagogical only code in order to improve overall style.