cleaned up Time_Macro.py a bit