Week 3 code review fixes