Mem2Array, Macro renaming, internal function restructuring