Separated some NA, EFIGI, and HC analysis routines