cleaning things up moving stuff around