formatting and moving of stuff around