Minor clean up. Added macro.