Tidy up week 4 a bit