Code updates for Setup exercise