Some final tweaks to lesson2 code