design and cleaning changes