refactor weeks 2 and 4 tidy up