Clean-up and new formatting