more macify
cleanup syntax