Move macro and adjust docstring