working commit on EXPAND-MACRO function
modify to refactor EXPAND-MACRO function and EXPAND-MACRO-1 function