refs #4: cleaned up the handling of MCA data