Week 1:
some cleanup