modernizes the macro a bit