Tightening up week 2 assignment