cleaned up a bit in preparation of next week's assignment