Improving macros