Some reformatting work