update to week 6 - some cleanup