Minor cleanup and "notes"