AIA-31 little cleanup