Cleanup and reformating