cleaning up and reformating