finshed: formatting newly added macros