Format & cleanup